Merge "use packageManager @SystemAPI"
am: e958bbd8ae

Change-Id: I28e807aaec27837ab31631eda97accf54198240c