Merge "Fix for bug 6110465."