Merge "Snap for 5949240 from 8facba432617cf9efbcd0e13b59dd8a62bb03e9f to sdk-release" into sdk-release