Merge changes I191b3b99,I40340ddb

* changes:
  Minor optimisations to InstallSource.
  Add originatingPackageName to InstallSource.