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: f2aae1f8 am: 1cd4830e
Change-Id: I8fd11fa40f56dfd23504275e204cde5b17446534