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

Change-Id: I82666e8068b7c660052004f438333bfd0ec3150a