Merge "Snap for 5590969 from eb9c31d1bc50ffe46af8045fdb3710084b83922a to sdk-release" into sdk-release