Merge commit 'fbf84d8387a76b229d362e2cda42b06d053be4b1' 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: Ic5829505e3de5b8786d26986c0df85ca8d5135b1