Snap for 9679998 from 75c1d6970331a21bb5780b5abfc5c2443393ed80 to sdk-release

Change-Id: I90baae1dad065d66fcf8b285dab075f9acbabfec