Merge "msm: 8974-tsens: Fix bugs in error handling"