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

Sync repo before doing SDK rebuild

BUG=b/257113269
TEST=presubmit

Change-Id: I3bb15d6ecfbe74fee8f9616e59567cd943f77e5f