Merge "Remove NPE in onPackageFailure" into rvc-dev