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

Change-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e