Merge "Snap for 5590969 from 659adfb8523712e2caaa50931d5191043c7aa547 to sdk-release" into sdk-release