am 1d88c087: am 4afe428f: am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev

* commit '1d88c087e6f95d1e29a2d657b4a446f2a20d75c4':
  Update the documentation on EXTRA_PEOPLE.