Snap for 6405781 from ef41fd8354a1561f8fe2fe6963807a7133b13cf9 to sdk-release

Change-Id: I98e92dcb09dd80b54c54dc6cd3833512a6ad4634