Adding a couple of Google workspace attributes

What does this MR do and why?

Describe in detail what your merge request does and why.

Following up on !88054 (merged) and !88247 (merged) with a couple of changes

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.