Merge "msm: Add support for EBI error reporting" into msm-3.4