Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev