Merge "TIF: Add content ratings" am: 0a69a874a7

Change-Id: I07e3a41bfea72c0b5a9920b8da8e12f578bdbaba