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

* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.
tree: 8287bd076e52f265ee47b60717fc476e977fa148
  1. core/
  2. services/
  3. tests/