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

Change-Id: I3bb34cf5b30642170d97162e2922377359066770