Upstream changes from Google (r703)

v6.3: Geocoding behaviour change, code clean-up, metadata updates.