Merge "Speed up map creation."
am: df3e89be94

Change-Id: Iba6f292a4448f065dcf64c6f3e40107b5042a62d