Merge "Add function definitions for MapInfo." am: 4c1560ce5c
am: 0597e4a8af

Change-Id: Ic235e7b1b1d346759db0643aec60542e9ccb162e