Updating to Gmap V3
(cherry picked from commit 64010d1825192b0b2321cb762d6f4738ebc90fdd)