Merge "Snap for 8023979 from 398f4a07e1b445d9a749612a895105f94a55d133 to sdk-release" into sdk-release