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

Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3