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: 37a45d89
Change-Id: I232536ef2070fee49a5e2f7b2747505f27148321