Merge "Snap for 6355086 from 4ce8b0dd93788463df83148e83b3fe2ae9cc962c to sdk-release" into sdk-release