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

Change-Id: I1298f1c8b9e7ee6abad624513be5c365389804f7