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

Change-Id: Ib6f337bf7f7cfa9c4c3627ae3bea6cbc1409040e