am b0828aa5: am 6d0e2c9c: Merge "Trim navigation bar buttons" into lmp-mr1-dev

* commit 'b0828aa552531a98a3513d2137cd8e94dd24f236':
  Trim navigation bar buttons