Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip

Change-Id: Icd434f687a963a7d99e606dffc7b7ba83ba20dad