am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"

* commit 'be49403a0362c18edaeafe59ac09baac14294dee':
  New command line tool 'idmap'