DO NOT MERGE Add support for unprovisioned top nav bar
am: 1a13af51ba

Change-Id: Ib558aed5aa8ff57f0651517f25bd742b300154a9