[automerger skipped]Merge "new WFC registration failure notification string" am: 8bcb7aa971 am: 88959d3ceb  -s ours
am: f6a55b6d6d  -s ours

Change-Id: I8468a8874d5dfefae94e6b08eafe4d5bcfdc1001