Merge changes from topic "stacks_envsetup"
am: 759a6f75ff

Change-Id: I42facf6b00b039e37d62706bde4498117e90ec3f