Snap for 6435660 from b6b645909d0c1b991d4a094de3319ac88a48a9cf to sdk-release

Change-Id: I4f8524f91e4e25bc9eae2df6809f03a9357e6095