Merge "Fix legacy APIs." into lmp-preview-dev