Snap for 7110675 from 835b8620c7f98af3dc31d857257e80a12d10c778 to sdk-release

Change-Id: I0146aa135e584f0a0f9fa581501851f5d03187be