Merge "Improve content descriptions a bit" into lmp-mr1-dev