Merge "Snap for 8782634 from 28c466a6329dcee64e2289879eed80c41a5e3bbe to sdk-release" into sdk-release