Merge "Remove NPE in onPackageFailure" into rvc-dev am: 3ec553e20b am: 68c9d64ffb

Change-Id: Ib04a6fac6495cccd52d727eb1545c071b03ce657