Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 am: ab3235ad5b
am: 5fb8ac2010

Change-Id: I12a8c77d01f3c8655c735c9408f164f0e894f6db