Snap for 10929834 from a248dafd7653b99fc45f9d29e5f139b04f2f28bc to sdk-release

Change-Id: I4a86cbdf95a1ae09112aa498276b913500e8fee1