am 8f39429b: Merge "Improve content descriptions a bit" into lmp-mr1-dev

* commit '8f39429b533d35502182a1e7bd6220e65e7e7532':
  Improve content descriptions a bit