Merge "msm: pil: Include peripheral name in error prints" into msm-3.0