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

* commit '0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
  New command line tool 'idmap'