Merge "Fixed build breakage due to api change." into lmp-mr1-dev