Merge changes I1a1077c1,I7adb6de2,Ieea1af71

* changes:
  Clean up updateAccessPoints.
  Remove unused variables and resulting conditionals.
  Execute all callbacks on the MainThread.