Snap for 6435660 from ee6d02b6c48b7119b81a913a760092450cf32df2 to sdk-release

Change-Id: I36f7cfb5e1f840901fd5366e9efedceaafd47168