Merge commit 'fa3a97f2efb870d71b6507ac8fe512dcaa30e8f2' into cos-sdk

Merging 17615.0.0 into cos-sdk. Getting cos-sdk up to date in advance of
the ChromeOS update.

BUG=b/277779682
TEST=presubmit
RELEASE_NOTE=None

Change-Id: Ied8ce8f890feb132f6dbc4aa942266120eafb322