am cb3427d0: Merge "Remove support for legacy APIs." into klp-dev

* commit 'cb3427d06608e9827c164e662ffa360b9aa48579':
  Remove support for legacy APIs.