Snap for 11541002 from 30e3976ba56f9d789689d8760599793c33e46f60 to sdk-release

Change-Id: I36e89d918677907f5a520decb430a6f400775e9e