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

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