Snap for 7183507 from bb6267e067ecee941fade39b80d9b476951fc692 to sdk-release

Change-Id: I5f2705325e1f73437d9b456395059653770455c7