Merge "Fix docs build breakage" into lmp-mr1-dev