Merge "Move Rating and MediaDescription into mainline module"