am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev

* commit 'f6ee08469a2bffc6464ad34932c1e41105e2c7fe':
  TIF: Make TV content rating names consistent