Merge "use packageManager @SystemAPI" am: e958bbd8ae
am: 206d891d07

Change-Id: Iec4e41628f3378876605c119ac7f7f58634d176c