Snap for 11573087 from 85763f1b385af21473bda94c2b0c6bee62545db9 to sdk-release

Change-Id: I376ccd6e4e80999eec38a0f4a7b5942575cd92c0