Merge "Fix NPE when passing null TvContentRating" into lmp-dev