Merge "Replace the switch item with the text for multiple shortcut menu." into...
Merge "Replace the switch item with the text for multiple shortcut menu." into rvc-dev am: c463e56a am: 20c4d45d am: 46c63d57 am: 910e5b25
Change-Id: I5f4988f4210e270f0bce3ae841faf3ed933f50a8