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

* commit 'f67bda68a579a8ac79f9d8f889e0233a8f94da55':
  Fix a lint error and update a test after the phi fix.