Merge "Update for change MapInfo constructor." am: c53b0e9603 am: 9793ce2ede am: 19cb6e0939

Change-Id: I81aea9421e4fee1e0b37685de585b3e76448d56b