Merge "Fix issue 3400751."