Snap for 12440112 from e38bc4e83795d72de1b0baea24a5930e4ec9fd26 to sdk-release

Change-Id: I975831c7cafd6ed648fe763f464559ccea57cb7b