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