Merge "Revive DeadZone" into oc-dev am: b278424fa6
am: d37884a528

Change-Id: I4d9fcbd97aa09d15d8cd8b1f9ab515c3c53be077