Merge "Fix bug 2495033."