Merge "Roll back nav bar interface to version 2" into oc-mr1-dev
am: e2a372075d

Change-Id: I5c19b76cb21b6c65be8b3b243ef9e529968d7d59