Merge \"Perform density changes inside test activity in CTS\" into nyc-dev
am: 9aa40d1f38

Change-Id: Ifbc3115eb00793f59f87afaa576c653077817ee9