Snap for 7183507 from 9e5e2465853c988625bd943ecb589ad897f00823 to sdk-release

Change-Id: I5153be350723cddfeca1f8df53abbead5c989f24