Merge "Update for chnaged MapInfo constructor."
am: a4aa6985f7

Change-Id: I528e6232d20ad89745f7dd0674a0ccbe28d738b4