Merge "Speed up map creation." am: df3e89be94 am: 2bf9cbf233
am: bd048209b4

Change-Id: If598ef3d52cdc8d383d0a188c8e058cf1c51441f