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

Change-Id: If5c59dee1777358540f1f5cd88a49539cf3f882f