Merge "Snap for 5590969 from 61eae8ffd1a16c89db1c01e95afad67cecfcbe09 to sdk-release" into sdk-release