Merge "Show error code in WFC error notification." into oc-dr1-dev
am: d2063214a5

Change-Id: I7c1980af1c877c7b3b4500daccb1226876c7e5bf