switch back to wpa from cm

Change-Id: I249eca27ab20076204a2a3b5016bfe8a8174f2d3