Merge "edify: Rename parse_string to ParseString and let it take std::string." am: 6b18eb706e
am: 17cda674f3

Change-Id: Ifc341348415c461cdb76e67900bb097520158551