Merge "Snap for 10399941 from 2c7e0992f1ef0368b16162a5ac7900127516d215 to sdk-release" into sdk-release