Snap for 6435660 from 27fa4eeb5967e0bae5aef6de643739bef2a58726 to sdk-release

Change-Id: I03191de38394cf3646e2b197f86cd557245a51b5