[automerger skipped] Merge "separate URL for WFC settings" am: 744c5f217e am: c67065a800
am: 355a0efcad  -s ours

Change-Id: I12c9b5d53e6f91dfd6391ec3a31fda63a89e5cc5