Merge "Fix a lint error and update a test after the phi fix."