Merge "Snap for 9679998 from bb4c61aa349437f1993b6df0966da83dd8ec9d1f to sdk-release" into sdk-release