Merge "msm:vidc: Amend error checks on ION API failures"