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

Change-Id: I2b0dfc1807037c73b09d629f52b04c2f2e8f2d18