Conflicts: tools/import-trace/RegisterImporter.cc Change-Id: I4f49c976bd60badba73c15746aa03c420cb9f77b