Snap for 11754915 from 7e256ca4aba10ef45e2588255cab83afef282258 to sdk-release

Change-Id: I1df45a99b833b44304f7681dc57243e816f106f6