Snap for 11812660 from 10cb7d967b63958bf694d9bd503ce4c63b015789 to sdk-release

Change-Id: I8308a2fe4b4f676141ed6458ab7528dd9e18597c