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

* commit '201bb0f7bbf2b3e10c364f5da19ce5e760035381':
  Remove use of private API.