Snap for 7110675 from 482c9e833ef6aaa8ad3ea7e6efedc1d120fb0ac5 to sdk-release

Change-Id: I270306a8883eda6bdd41858e4f6f858efd735d14