Snap for 4429331 from 0a8c90248264a8b26970b4473770bcc3df8515fe to sdk-release

Change-Id: Ied64a106c5bed89a6915b73d4e15e1adcf19f388