am 515134e8: am c7969dea: Merge "Fix obsolete API reference" into klp-dev

* commit '515134e88c0c1cdfb06a1ec22946554d2d98c8d2':
  Fix obsolete API reference