Merge cherrypicks of [6905455, 6905456, 6905457, 6905458, 6905459] into studio-3.4-release

Change-Id: I08e29995d7b6a90d7fb9c237b5ef0dd87e934bf9