Merge "Snap for 6660490 from d53de4257603f3292c5928d74d59aa0e3259efd7 to sdk-release" into sdk-release