Snap for 12546431 from 5ce75128a26e162c6fba3c26bec7e8b2d3deb731 to sdk-release

Change-Id: I2cdb4441ff1770cd37951e9dbb58079b3538306a