Merge changes from topic "am-7d2d9cdc160045768d103b187e51cab6" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "DO NOT MERGE Fix NPE in executeDeletePackageLIF." into rvc-dev am: 17d62ac4c7 am: 8218f351d8 am: be69e09c86
  DO NOT MERGE Fix NPE in executeDeletePackageLIF. am: 01e0f4813a am: b2487b7862 am: 4bd6c09f00