Merge "Show error code in WFC error messages." into oc-dr1-dev