Snap for 11871564 from 13ed94458e82368c78a17cd6c9aa23e557cde9a4 to sdk-release

Change-Id: I5280fa592da56ce1aa05d4983aedd46dbd91db91