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

Change-Id: Ifcf1004c143dae1e3c1056ad99dc9c39af5b2d5d