Merge "Snap for 11724015 from b079a60ec0857ee68dbd0eba39c20998213611fc to sdk-release" into sdk-release