Merge "Fix bug 2537626."