Snap for 5374970 from 74cd2b237ec971ac4ae256e924e88228dd44cef1 to studio-3.5-release

Change-Id: Ia0720f007453cac4d9a7e38df9183ba07063915c