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

Change-Id: Ie347d0a8b8bcbaa775c845129d500d1052126e0e