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

Change-Id: I721cf33c4b69b08260eccbde1ed545caa9cdc124