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

Change-Id: If9bb3fb9aab16d5d4b4701ea85d8114c36e2b00b