Merge "DO NOT MERGE: Keep access point list updated once in short time" am: d7682e6d3c
-s ours am: bc00e361d5
am: b50162415a
-s ours
Change-Id: I9f7850dfd0836b6e3e6c40bca8295e515a476bef
This commit is contained in: