Merge "Snap for 5475808 from 220241f2668c7e052dcc34fd66e352a78c06e791 to sdk-release" into sdk-release