Merge "Revert "Announce access point changes."" into nyc-dev