Snap for 11541002 from ec5ce4148e4305e26cac35f17c256dfb061f4080 to sdk-release

Change-Id: I1b89369ef7dd5b1414801424f81af76e42a8eb67