Merge "Snap for 7185589 from 8b678848c31ca7f016e54566327daf1ff42f5be3 to sdk-release" into sdk-release