Snap for 12349386 from 00d411d6605a2b9df2b5092c3460f8dbedcf4f1b to sdk-release

Change-Id: I109cc8eaade2fd0beb28a1b341588095a64dd0f6