Merge "Remove deprecated API usage" into lmp-mr1-dev