Merge "Bug 4608375"