Merge "Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6f7 am: d5a0b76227 am: 3ca94f6a66" into rvc-qpr-dev-plus-aosp