Merge "Expose bssids for AccessPoints" into nyc-dev