Merge "new WFC registration failure notification string"
am: 8bcb7aa971

Change-Id: I7784e82e4b788597ba9c35da7175b485230ab227