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

Change-Id: Ia2ac301a7c66359593c5793821b4282d5fc8c251