Merge "Snap for 5925869 from e0e34a7f5cfde7c5dd3d3f3c7197fee014d1454a to sdk-release" into sdk-release