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

Change-Id: I07be24b3ac8a58d041e8bf09857cb1209ab89c2c