Merge "Fix build breakage because missing API methods." into lmp-mr1-dev