Merge "separate URL for WFC settings" am: 744c5f217e
am: c67065a800

Change-Id: Iadbbb2a902675d936e5ae14432559331991fd6ef