Merge "Snap for 11699450 from ab2daeca28b23a164a8bb5100e3e39a4092a7689 to sdk-release" into sdk-release