Snap for 11541002 from 5a4c2a321e06f0c5949cdea992f6dafe93a48adf to sdk-release

Change-Id: I3b8bea6fbdaefde4301c438f419d40b7f11dc068