Snap for 11481241 from b30ccf3bbdb5adcafebdc3671567fe4b36752996 to sdk-release

Change-Id: I160d31ca0f2ee52ab7622964269239dc6aa2c719