Merge "Snap for 9550355 from 286f46824a6736398ded0b4d4f5c4f531bab03cf to sdk-release" into sdk-release