Merge "API review fixes" into jb-dev
tree: 29fec3ca79b84ceac4ab1fbd5106d0ecc18fb113
  1. core/
  2. services/
  3. wifi/