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

Sync repo before doing SDK rebuild

BUG=b/257113269
TEST=presubmit

Change-Id: Idf685048fe1af4f7c5811a2555ad7f720299ea0b