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

Change-Id: Ib55384d465e57e98f7237f5f0102bf544566e5f4