Snap for 11541002 from 274fd5210af7852f1c1612185f0f96027c4b276d to sdk-release

Change-Id: I4e438fc84435cd8cc7baed873d2d5a68ee521ada