ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com> GitOrigin-RevId: 1a4706c0eafb9a683aab304a5f51c709c1325fd3
