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