Merge "Revive DeadZone" into oc-dev am: b278424fa6 am: 305fe47d65
am: d5c0ef9467

Change-Id: Iec82102d862097ef3242da9103996afe94f0909c