Merge "Snap for 5234541 from 18142ab0a35da3bfb47f5af8ebcd27e232e9de8a to sdk-release" into sdk-release