Merge remote-tracking branch 'quic/caf/google/MC12' into HEAD

Change-Id: Idc3305d250bbcb2a0f2c7fbac698e0693342e62c