Merge "Snap for 13198286 from 22535836b12c5e7430dc9867261c2116d5a4947e to sdk-release" into sdk-release