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

Change-Id: I76e77458efcf28134c07b557caa9b7406342090c