[Bug 790231], [Bug 791506] and Add WPS AP Selection