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

Change-Id: I875857b184687a3934c6d446cc099f23704ba28a