Merge "rootdir: init.trace.rc too early"