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

* commit '2d0055dd3d3f067ef0ab2db6f8358b69d60880d9':
  Revert "Add module 'idmap'."