Merge "Fix sscanf/wcstod parsing of NaNs."
am: 8327a1707b

Change-Id: Ife36d8cba24e88909751f8fcd5ade05e9bf23830