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

Change-Id: I3bbe9f4cb488082d11767016288d060193243eb6