Snap for 12349386 from dad754a0f987224adb4e7d915d4bb6699b710d1c to sdk-release

Change-Id: I6ac253238779a6f1c91b4873a3f8a88bb45eadb2