Snap for 11541002 from 87df9414060880732a17fe07be9cab5ec091cf63 to sdk-release

Change-Id: I92d0fea9ea107ba54c4be3654c05a3b8b542462b