Snap for 7110675 from 56cb1af3b1b8ddf991715afd58a92f4de1af2e36 to sdk-release

Change-Id: I5b0de6839251ed0e5d8c6539c2e162fd9c0b44ec