Merge "Snap for 4965753 from c465fef277928c5e5313db6f4e114ccecfb130b7 to sdk-release" into sdk-release