Merge "Remove some duplicate code in ProfilerSimpleTrace"