Merge "Hide multi-endpoint APIs." into nyc-dev
am: d54c077

* commit 'd54c077d0890ae82f35d6fa658e58ff2a1f1f354':
  Hide multi-endpoint APIs.

Change-Id: Ic77a7bd75346deb745cc9ec252b73259b4409101