Merge "Snap for 11541002 from 47ee746be7d10f0548de8c6b377918e00812d8d1 to sdk-release" into sdk-release