Merge "DO NOT MERGE: Keep access point list updated once in short time" am:...
Merge "DO NOT MERGE: Keep access point list updated once in short time" am: d7682e6d -s ours am: bc00e361
am: b5016241 -s ours
Change-Id: I9f7850dfd0836b6e3e6c40bca8295e515a476bef