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

Change-Id: I43ff2a3e1a46cffd38e5f07c5d4181d0f5c802c4