Snap for 13242496 from 7b05b277beee599532606e9bb6d7a71f5ca2ab6e to sdk-release

Change-Id: I0e821c5e325ee38e78e73b8a4332bb555655b3e9