Merge "Make proxy API public"
tree: 31cef54dd98e135f719a401e370ad20bd9ac7eac
  1. core/
  2. services/
  3. tests/