Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc13 am: dcc95b94 am: ab3235ad Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3