Merge "Snap for 8554636 from 5fa296619790cbd710e3668dfa0454c3864ea85e to sdk-release" into sdk-release