Snap for 4592651 from 2ad3e0ecc3855abd777092b199c5d6842056b3b3 to studio-3.1-release

Change-Id: If46f61da5b096dbfd3d7842960d59f01e7883311