Merge "Fix for bug 6104272."