Snap for 5358809 from edacc06118be057718385f56dc056a0b2e576cd5 to studio-3.4-release

Change-Id: I80fa8660d9cbc34d2fcb7e2286a91273f6bdcdb5