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

Change-Id: Id404a42a50c36f3fd223bf33cee640d0084944ee