Merge "Merge remote-tracking branch 'quic/tmp-db70ae6b' into msm-3.4"