Snap for 11217755 from 079e333e04410c85853aa533ee36004d5b54b21b to sdk-release

Change-Id: Iffaacd17f750d79dd52f480b5cd22d4493d404ec