Snap for 6435660 from a2e4f6daae9bb4cf7b26c6ed4b859830cf18a812 to sdk-release

Change-Id: I5a902a8ca8a1b4948063ea5d8af6cbe81f5ef7c5