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