Merge "Fix issue 3217707."