am 75e6c771: Merge change 22169 into eclair

Merge commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be'

* commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be':
  Cleanup the Galaxy, add a few RS functions for Grass.