Merge "[Wi-Fi] Refine code for saved AccessPoints"