Snap for 11098369 from ba8a3734f0831d51bf1fb4744d07b86398cde9b5 to 24D1-release

Change-Id: I2b93bdbd962bdde6d96a1effea38a441e4031e49