Snap for 12349386 from 36e17f0eadf4fd5e0f3646fccd4109c7ff8d1ea9 to sdk-release

Change-Id: I9641ec12d82445727f9b9352f889785643790376