Merge "Shrink the nav buttons some" into oc-dr1-dev am: 082a4e254f
am: d2d5a95024

Change-Id: Ib450bbe504e18f3224b4a24631b64c7cc94fe2e8