Merge "Snap for 9570125 from 72d6d8ecee940573f4844b4bb552ddfb55e509f6 to sdk-release" into sdk-release