Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e