Merge "Rename map names in read_mapinfo" am: 84b5650315 am: bff9eedce1
am: bec1129388

Change-Id: I96b1413300d98fccbd37d52d0c5e2c3d0d2f2798