Merge "Remove NPE in onPackageFailure" into rvc-dev am: 3ec553e20b am: 422f2ba0ab am: ed5c0d0d11

Change-Id: Iac1f74eb140bc1db5db981b1e26f066722f6513b