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

Change-Id: If09e67000ca5818c27bbfe521554c22209c0d04f