Merge "Add a NPE check before looping passpoint APs."