Merge "Snap for 5590969 from 036b111df5e0f73236a6abe8d59aae0ea28d217d to sdk-release" into sdk-release