Merge "Fix for bug 6170890."