Merge \"Revert \"Announce access point changes.\"\" into nyc-dev
am: a64e3a0844

Change-Id: If07be05e758c9a3e775dd9406637c4be7fdc85ca