Merge "Some cleanup of Proxy class."
tree: 73006a8cbbae3203b14253525372255a66877065
  1. core/
  2. services/