Merge "ParseFloat/ParseDouble, also take std::string" am: edc9cee49b
am: d367f37b1e

Change-Id: I74bd80dcb8f755d16a6ec148ba5639b6fd41af85