Snap for 7110675 from 1d2764e14448fcf7571a88bb1df71b7aa67762fd to sdk-release

Change-Id: I6fabb5450d499dd75eb804a32ccfa0250b5d97c4