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

Change-Id: If78f707596f24de6f6de622ebd1d7434e19b5822