Merge "Removed ProfilerStandard and ProfilerSimpleTrace"