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

* commit '27a4fa10a90c754da307ddda14e16c3864dc0413':
  Revert "Add module 'idmap'."