Merge "Add new parameter for creation of MapInfo object." am: 0aa188b3c8
am: 2aab42036a

Change-Id: Ic956feecf9a565171ab270105c0c9395895c2ff5