Merge changes Iad51cd85,I6414d28c

* changes:
  Minor refactorings and cleanups.
  Simplifying callback calls in PackageInstallerSession.