Snap for 6660490 from ca6f1cd817b61a4f65eb6e7cdb2c2f14906bb86f to sdk-release

Change-Id: I3745736f9819153b8d7b52fc2facbe784b24cc27