am b38edd12: am 256637ff: Merge "Handle renamed APIs" into klp-dev

* commit 'b38edd12c5af75325cf74c13c107607a6296b110':
  Handle renamed APIs