Merge "Tiny fix after updating the error reporting API" into mnc-dev