am 9d5f5d0e: Merge "Add domains for goldfish services."

* commit '9d5f5d0e49ee3000493af97acd9e62cb08f99ba7':
  Add domains for goldfish services.