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
Change-Id: I86679207cc76a8d1d1d271f5cba2ecbb281efe5c