Snap for 11955768 from 05f839659c11d1f64a1523dd7bbe678585719e52 to sdk-release

Change-Id: Iedb618858347c744186c4506de99773a2b0187e9