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

Change-Id: Ieddf489f9db986cc7c52a157736f4f25b1cd50c7