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

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