Snap for 9979206 from 3042508aee59d99ff9b319ad926113ac748d6e86 to sdk-release

Change-Id: I1ad30129bb5ff369b5a8c0e9714c4ee7c344d4fa