Fix to ensure the check is being saved, different code for angular

Reviewer: Dan V (post commit)

Issue: GCP-9522