Snap for 7110675 from 1be855983d2c54cbec7d28298ba011db0c5cbcea to sdk-release

Change-Id: I5ae5360648101261c05791e585156472c2ddbea4