Merge "Merge "Announce access point changes." into nyc-dev am: 6af7c23168 am: bc84c0fa67" into nyc-mr1-dev-plus-aosp