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

Change-Id: Ie4be52fa2e0d304aa268a4610ba03cb52997dd5d