Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev