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

Change-Id: I261b6f8e5a154aa214e2e02b8519d10823f0746f