[automerger skipped] Merge "use @SystemAPI in PackageManager" am: 729a8293...
[automerger skipped] Merge "use @SystemAPI in PackageManager" am: 729a8293 am: 349da344 am: dc8a62a1
am: e84b8f7e -s ours
am skip reason: change_id I06cf86189e4ef0e64ee39846649d08f31121274d with SHA1 73a18208 is in history
Change-Id: I414ba4569c1a0ca922aaf9ebab3ba70a517e8aac