Snap for 11541002 from d4d73f021e0db569efa3b2442c7613d34004d3ef to sdk-release

Change-Id: Ifdafb09b4001ba09548da303d393b4dddf3e87e6