Snap for 11541002 from 70b6b6924fde4a926a49249fe4398369ff6264b3 to sdk-release

Change-Id: I0d094638e9b91b07ca6fe36da71a43ca2ba9ed3c