Snap for 5179696 from 12cb5d3f886788b74450295f62da9d7517e7ba94 to studio-3.4-release

Change-Id: Ief1d58d5d8c301f54ebf50b0ff224e35b2115ca7