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

Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2