Merge "Snap for 4429331 from 6519ee31643ef95bb6f9204e817a7ab6484d6ecf to sdk-release" into sdk-release