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

* commit 'ff25dd337d1f7a079495c0c5f5bb69fd1f97548f':
  Removed offensive music genre