Merge "use @SystemAPI in PackageManager" am: 03b0291d1e am: df6aef083f
am: 9623274a42

Change-Id: If1c924f251e5ce83bb003dcfae71bd06ac7537f2