Merge "Remove redundent logic in isWfcProvisioned" am: 548633b97c am: 0a32f1aba8
am: 40a9d0b106

Change-Id: I535f031487e8b1a071597412a37ccf48e7a33016