Merge changes from topic "fix-package-manager-usages" am: 7ecda7500f am: 305f883475

Change-Id: I6bb485bdf2f48fc382cae75e6eb94cd0bd6e0f27