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

BUG=b/277779682
TEST=./update_chroot
RELEASE_NOTE=None

Change-Id: I3bb0e419ae0c8463a1b1756e91510b07316d8622