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

* commit 'b0a79d35929d874628c3e0add672eff498e26b83':
  Remove old hidden API.