am 271c3b74: am b1c1518e: Merge "Remove old hidden API."

* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
  Remove old hidden API.