Snap for 7183507 from 798e77f9ad5a4fd5b91b5cdf19ad52b515818522 to sdk-release

Change-Id: Idd508611509d15ace278060101b6d52a8aa27916