Merge remote-tracking branch 'cos/cos-sdk' into master

BUG=b/277779682
TEST=presubmit
RELEASE_NOTE=None

Change-Id: I924152e1e62da1c144ef0c18e19832e05e9e2f91