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

Change-Id: I047d03fe7be34d9ba1e48568beb25f1eaeefb9d8