Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 am: 22446ccf4a am: 1e348937e2 am: e84a8753b7
Change-Id: If7baf0cc6d808fb4b3d02d85d91ee6b0468c1dc7
This commit is contained in: