Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd...