am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev

* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.