Snap for 11926842 from 10e4f9e371291cce8546223e680296bf96a0912e to sdk-release

Change-Id: I6bf4296986f06ec07b4ea401524971d0af86356e