Merge "Snap for 9550355 from 838c317e2d7828bf3251c99d909da844619a66d2 to sdk-release" into sdk-release