Merge "Make sure at least XX maps are created." am: 4dac55d5fd
am: abae1313d1

Change-Id: Ia43ad5dccab041f65471a5b1a3160b6eb34ef668