Snap for 12349386 from 16d117978cbeee049fbba5bb6b127e1c8b44a4a2 to sdk-release

Change-Id: I2c4fc31c9a0f8e0105b9003d94638da5db589303