Snap for 12199818 from 3fa43adc78c44c2ca539fe749061277d1df21180 to sdk-release

Change-Id: I7a8a1c32ca55564c9bfb6a15547c0c935133569c