am e4abb37a: am 27a4fa10: am 2d0055dd: Merge "Revert "Add module \'idmap\'.""

* commit 'e4abb37a73e73d26c1b7f9ddf427af8fa5f0ff0a':
  Revert "Add module 'idmap'."