Snap for 5234541 from 4647d12453172d3a14c912eeed19ab679184b2f6 to sdk-release

Change-Id: I295d4a8b91c4cf4a0b3b8f4128e94177204780ac