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

Change-Id: I78a1446dd91cf19db9a866e12d4dccebac7bf684