Merge "Snap for 8952093 from 2bcc92ae19481dd2b8d3ce3abdfbbee49261abe6 to sdk-release" into sdk-release