Merge "Snap for 6877830 from d219b55202eae5964ebcd1637b8c59e01a0cfc81 to sdk-release" into sdk-release