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