Snap for 7183507 from 1bf1b4c3b17d3009c8e13979685bce563eaf2204 to sdk-release

Change-Id: I0ec70108f5cd2fa694925da10584de5da6458a3b