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

Change-Id: I5ec842f32beb2eae0fd4889ba8b70997d7c2dad1