[automerger skipped] Merge changes from topic "fix-package-manager-usages" am:...
[automerger skipped] Merge changes from topic "fix-package-manager-usages" am: 0a4fac6c am: 684d34bb am: 283b63ef -s ours
am skip reason: Change-Id Ifc32ee29c488193c49070db11555899a93ceec0d with SHA-1 96c824e2 is in history
Change-Id: Id204e40ad16c1a15f19a802cc69285a9b0e14b3c