Snap for 12743396 from 65fcce4f0b36c7396f71e1cc4b556327f666fa8b to sdk-release

Change-Id: I2add50d6f37651265caca4afef941f2260ad78d3