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

Change-Id: I1402412d130edc9ad32cc60c030c92711a487b96