Merge "Snap for 6290619 from 5df6d01fec036b0e6954b4e0e79adbea982a3020 to sdk-release" into sdk-release