Merge "Snap for 8782634 from 5d63bfcd663aaa1892c6dd5fe783316115acf5cb to sdk-release" into sdk-release