Merge "Update for change MapInfo constructor."
am: c53b0e9603

Change-Id: Ia9a2a1966dd15424304a56a1f55621dbc6451dd2