Merge "Revert "Workaround Darwin ContainedWithinExistingMap issue"" into lmp-dev-plus-aosp