Merge "Clear WIFI namspace on primary user keystore reset." into sc-dev