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

Change-Id: I23209ea505140a48177b1b4fe78d36699240653e