Merge "Catch NameNotFoundException during onPackageModified" into tm-qpr-dev