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

* commit '77532f584a203a429c0a6601479303d4b132a304':
  Improve content descriptions a bit