Merge "Snap for 5590969 from 7e5e5ea860650355c7cc9d4269028ef226b730d7 to sdk-release" into sdk-release