Merge "Refactor AutoFill server code."