Snap for 9979206 from 99b28c87054679e66517c9c3c89fe99654e15cfc to sdk-release

Change-Id: I40b2ceb6bd14eabeeb66162f3f80885fe95a76f5