Merge "Refactor SoftApManagerTest." into nyc-dev
tree: e950af0869461c1b451d1771ef7f1bf2c80e31b8
  1. service/
  2. tests/