Merge "Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6 am: d5a0b762 am: 3ca94f6a" into rvc-qpr-dev-plus-aosp