Merge "Add Japanese content ratings" into lmp-dev