Merge "Snap for 5590969 from 9b8a742210166be30d164023ce6d4cf0951e03be to sdk-release" into sdk-release