[automerger skipped] Merge "Updates menus after provisioning changes" am: 20f2ec5440 am: ec66c5029c
am: 318600bf07 -s ours
am skip reason: change_id Ic4c4d07a2935fcd8d983481722ce1a9437fda7c4 with SHA1 82d5d741e1 is in history

Change-Id: Ie0eca19d1346326ddb5fecd1ca2593d85f7398b8