Merge "UPSTREAM: Merge remote-tracking branch 'quic/dev/msm-4.9-camx' into mainline (msm-4.9)"