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

Change-Id: Id6679935220de109c9d891431696fc3354a021fd