Snap for 12949186 from bbf7192a59789b4a07abff80e329788bb9eacc35 to sdk-release

Change-Id: I757d400405e3a1b002dab29ed4c3ae5ec7bc111b