am 39e3b7fe: Merge "Remove use of private API." into jb-mr1-dev

* commit '39e3b7fe2323fbb067847aba9b1b5bb3d072a91d':
  Remove use of private API.