Merge "Snap for 10214594 from 2e2a114d4a1256cea0604d7ef02cd215c4d90117 to sdk-release" into sdk-release