am fc8da790: am 676e964d: Merge "Remove a test for dead code."

* commit 'fc8da7901a17f5bf064d39e6d9327c2094851428':
  Remove a test for dead code.