Snap for 11541002 from 865f062b6bb380cc789be47a651b52e8191a408d to sdk-release

Change-Id: I73cad41b0999b339cea0be638b227d24bc29d6d6