Merge "Snap for 11541002 from 699bafd47854e23a7750d248b6ab41be730c962c to sdk-release" into sdk-release