Snap for 6435660 from fa14c70fdb2776199e2d7c46149dba60c9a149a5 to sdk-release

Change-Id: I82d58231be778a739a7dc12ca1571d0c25db602c