Merge "msm: Add support for cache error reporting" into msm-3.0