Pushing fix that dan v made on my laptop due to power outage in his laptop

Reviewer: Dan J (me)

Issue: GCP-9514