Snap for 11579193 from cffb9270542b4edf5026612003821eed471ab166 to sdk-release

Change-Id: I4f4684662cbe903fa8fbd864c56976bef0d49ac7