Merge "Fix docs per API review." into lmp-mr1-dev