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