Snap for 9979206 from 5519d4c1f3ffbc5a1e1cf2f79246df88038f45ef to sdk-release

Change-Id: I75c8949c859acb47351271424493097f6d9171fc