Merge "Snap for 7110675 from f4219c3b780c03e14e32b081905588c9f1338849 to sdk-release" into sdk-release