Merge \"Revert \"Revert \"Scan immune spaces using mod union tables.\"\"\"
am: fcc3c6d26a

Change-Id: Id762c75f579d621cb67ca8ea7b7c16024732e23c