Merge "Run update-api to fix build" into lmp-mr1-dev