Cherry-pick "GCP release/0.5 - fix GSA Challenge (GONRG-1796)" into release/0.5
This cherry picks !67 (merged) in release/0.5, which is needed to fix a failure in the Notification service (Register is a dependency of Notification).
This cherry picks !67 (merged) in release/0.5, which is needed to fix a failure in the Notification service (Register is a dependency of Notification).