Snap for 11812660 from af1cfb351814a6ad72df9e6f25fa6ad8e1de5da8 to sdk-release

Change-Id: Ida486cee7b3e8836ad4f8d8a8ca18de98f706c0f