am b1c1518e: Merge "Remove old hidden API."

* commit 'b1c1518ef1e89fb8bc42022b6455a695cacd949c':
  Remove old hidden API.