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

Change-Id: Ibab724fa3f48e765fbd208e5ab0b9af32fcef38d