Snap for 7110675 from 7f19f72930a7cb438e435dec316bfcaa25ee4307 to sdk-release

Change-Id: I4a09eb35ec78a5a4760bc4b862bc9836bdbafcdb