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

Change-Id: I1797d5fb9806f403ca113774382ed94d28f78f5d