Merge "Snap for 8121614 from 35c5124850bba0a97aac80e4465dbc243827ffb7 to sdk-release" into sdk-release