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

Change-Id: Ib1d058a8db16a7ee771235fade74e4bea6d6d618