Snap for 12681951 from a562a0b0fedd47542a45408f923abdf1a7207320 to sdk-release

Change-Id: I13ee94b43a596a0b3a76dd814e37b08241059d11