Merge "new WFC registration failure notification string" into pi-dev am: 397b0d0dd5
am: 7ebfe28c95

Change-Id: Ifc3dcad108c565ba31145606c5f2b12c3d398fe3