am 479f131d: Merge "Disable adding main and non moving spaces to immune region in GSS"

* commit '479f131d4bd3829dd512312020808b05f5a591f1':
  Disable adding main and non moving spaces to immune region in GSS