Merge "Snap for 11598262 from 79370bd83c708bdc2545ccaabcb4841929a5109c to sdk-release" into sdk-release