Merge "Snap for 9550355 from 06a150b9f5bfe8543115f0f1f6f45e512aef9e24 to sdk-release" into sdk-release