Merge changes Iab3f9914,I5d5da5e7

* changes:
  Average scan results for AccessPoints.
  Fix broken AccessPointTests.