Merge "Remove legacy idmap binary"