Merge "Snap for 5925869 from 431834fadfa5b32b7f756bd53748a0595864ec21 to sdk-release" into sdk-release