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

Change-Id: I6018224b50274a92b060407c5e76045206ad6978