am 162b4411: Merge "Stop using unreasonable numbers of map entries."

* commit '162b4411fc79fe906020ebdf9e85883237fac8c3':
  Stop using unreasonable numbers of map entries.