am 7a4d856c: Merge "Removed offensive music genre"

* commit '7a4d856c881ef48ad590d9e5a0456c94d188898a':
  Removed offensive music genre