am c47bea9d: Merge "Remove nonexisting module names."

* commit 'c47bea9dd9288bf429afe1434829afd5e8c208a0':
  Remove nonexisting module names.