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