Merge "Snap for 11541002 from c119d5a52f80289c7f939746ddc31c8bcee2a3ca to sdk-release" into sdk-release