[automerger skipped] Merge changes from topic "fix-package-manager-usages" am: 7ecda7500f am: 305f883475 am: a19cc690fb -s ours
am skip reason: Change-Id I2e2ec2c421773e3ff58556373896238e1ff0678a with SHA-1 0703809472 is in history

Change-Id: I3119d6e8ce01fc68e3fde70a4998925be6ab6332