Merge "Use std::string for profile operations instead of const char"
am: 7c7d888d94

Change-Id: I44676d7bc0b9297ccb920066284f371fa2e40c3c