Merge "DO NOT MERGE: Keep access point list updated once in short time"
am: d7682e6d3c  -s ours

Change-Id: I134755ec0ec77dea80649440b969f9bcee8eab17