Snap for 7183507 from 27ca45bac4727f78115e8cb7858a653c3eace7e9 to sdk-release

Change-Id: I5910462ffdc116bd37f6a7a73de137a122d45b20