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

Change-Id: I3d3de1578520ce9dc0a5380a1d0f1b8fb343d2f7