Merge "[Ongoing Call] Add a temporary workaround for b/178406514." into sc-dev