[automerger skipped] Merge "separate URL for WFC settings" am: 9d4ebdf379 am: 5e5e921d22
am: 123559814a  -s ours

Change-Id: I31446b413a9f5714e1612583e7ea289d849ae84c