Snap for 9979206 from 0c1648cbf215894a0418bc9994b21d351327b1d7 to sdk-release

Change-Id: I0f36eff5c2d86586adc6340d6b8835f67d7e0347