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