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

Change-Id: Id153571cebba7548aef214e42e85251910785f07