Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev...
Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e am: d789b7b9" into oc-mr1-dev-plus-aosp
am: ad0a8267
Change-Id: I4a4c6ce14d1d9f25cc072bc4e5317b478dc0c75b