Merge "Clear identity before calling out to PackageHelper" into lmp-dev