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

Change-Id: I824d83b6c6cada0c29a302b93644a08766c4a2a7