Merge "Snap for 9550355 from 2eca2e750bc917d2ef07228bbda6f9339aef66e6 to sdk-release" into sdk-release