Merge "Use user WFC setting instead of checking WFC service status" am: 98c9c360fe am: 5de0605453
am: 5fb96bee6e

Change-Id: I60d6960b5ac028f48726e47d387cd561caecb9aa