am 574758ef: Merge "Make a couple of map checks debug only." into lmp-dev

* commit '574758ef03b0930ebd1cb8d9afe741cb374419a1':
  Make a couple of map checks debug only.