Merge "Snap for 6290619 from 305f57acae3db551f90971ed7c635fea7647ed66 to sdk-release" into sdk-release