Snap for 10929834 from 5dc6cb253ed0f313cededbdb0932be2c73032bad to sdk-release

Change-Id: I3073584d33322b2579a4e12a5c18ef465a7b02d6