Snap for 7110675 from f15a656dc557b66e5a9f5c7fa5d5d079292e053d to sdk-release

Change-Id: I18a591a27a7497f9f1ed1434d02b03b162f5c7e2