Merge "InstallPackage now takes a package as parameter" am: 87e2275970 am: a927a16841
am: f7498516ca

Change-Id: I904eb7a84395e676f5ec4bddcdc393949524774f