Update 86 geocoding

Kanged from http://bbs.gfan.com/forum.php?mod=viewthread&tid=5492712

Change-Id: I5461bdbe7741a736fadcb78b7c204cc83eecdf44