Snap for 11754915 from b25f9764fe178236d052db7ff7e8ae9d1ab58053 to sdk-release

Change-Id: Ic72a554522873dae86f1896e97c0996c0a7cf15e