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

Change-Id: I47469cad65cbdb58cac8d153f917ec53efd759ed