Merge "Updates menus after provisioning changes"
am: 20f2ec5440

Change-Id: I603918b604551d0c7b2580226d319da1b091a7ef