Snap for 5735642 from 97c06703f6cd899d62b83ba8c7d2b226ad12da95 to sdk-release

Change-Id: I52f652c70711ec726db8cecaf9aa504941724c6d