Merge "Snap for 8554636 from 4d4e1523a2710f220e493b0651fa1f0927218940 to sdk-release" into sdk-release