am 8b805b17: Remove use of private APIs

* commit '8b805b17158886035b38261eb611d8641701ae43':
  Remove use of private APIs