Snap for 7110675 from a532c858b165732675e250fb5fbeaf3841ad60d1 to sdk-release

Change-Id: Iaeb405013908c256b1a4e103f3c074567b2f4034