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

Change-Id: I3fe33151812652ab91e73f69a615094c73395f6f