Snap for 7183507 from 1f2085cf069a279fd0bcba4f5c34a4e7c2bfc97a to sdk-release

Change-Id: I987201f3aea1b12097430f8d366b94918fd4a9b8