Merge "Bug 516607"