Snap for 6435660 from 36df4013c818651aa5a57e042e3fd778b3030f63 to sdk-release

Change-Id: I6aedb8ba5831c8f6ecce0dfd6bacc880d9adaef2