am 6791ebde: am 7a4d856c: Merge "Removed offensive music genre"

* commit '6791ebde5f951566058cb32d1adb03447876268c':
  Removed offensive music genre