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

Change-Id: I3f534d166a4296411b09e9d54116cdf17f61f818