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

Change-Id: Ia83d4a4f00029cd7f00c038db981e4d3a49d3810