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

Change-Id: I04bc9125fec5b8b0c4ed104e5a538b2a27c2539d