Merge "Snap for 9550355 from ca3b60361256cc97d839b2e235f78cc2f45d52d8 to sdk-release" into sdk-release