Merge "base: genlock: Add error messages for failure cases" into msm-3.0