Merge "Update Java doc for TV Rating system" into lmp-dev