Merge "Make proxy API public" am: 18d0621adf

Original change: undetermined

Change-Id: I91a68a0f778650f384c5e03a3f091113599baaed