Merge "Snap for 5934975 from 62f8e3510da3eb663810a30d64222d96cd5a2c23 to sdk-release" into sdk-release