am 6b8f8688: Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev

* commit '6b8f868862de9c8a191462ab2a2c979aea4857d3':
  Workaround Darwin ContainedWithinExistingMap issue