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

Change-Id: I32adfc8646bb9fa6d2367743c9ea8325a6955dbc