Snap for 6435660 from 457c5afe565621ef7944f05d4e0640bf3a07ddf7 to sdk-release

Change-Id: I9f919ed9bae3e4a27a68221c6307bcca5224108d