Merge "Update java doc for content rating systems" into lmp-dev