Upstream code changes from Google (r702)

Remove obsolete code that treated numbers where we had no metadata as valid.