Merge "separate URL for WFC settings"
am: 9d4ebdf379

Change-Id: Id13b3ed7694f40646f5bfa6f4877ad614da77415