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