Merge "Snap for 11878282 from 8d754eaf74ab61e8c76be4ef448bf9122ed7d359 to sdk-release" into sdk-release