am 66e39275: Merge "rootdir: init.trace.rc too early"

* commit '66e39275be57352e357d8c5cdff73bc911758daa':
  rootdir: init.trace.rc too early