am f63063c7: am 01bd8e3d: Merge "Revert "Disable adding main and non moving spaces to immune region in GSS"" into lmp-dev

* commit 'f63063c7f9f37786bc174e78c57309a7888d7b98':
  Revert "Disable adding main and non moving spaces to immune region in GSS"