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

Change-Id: Ieace05c849161fefa9e911968c3306f93e65aea3