Police said Rivera fled the scene after the crash and then abandoned his car in the 1200 block of W. Katella Avenue. Detectives found the victim's hair and blood on the shattered windshield and the roof of the car.
Shannon was transported to University of California, Irvine Medical Center where he died April 30 as a result of severe head injuries. Rivera turned himself into his parole agent on April 27.
Rivera has four prior convictions ranging from possession of methamphetamine to fleeing a police officer.
In the case of the hit-and-run, Rivera is being charged with one felony count of vehicular manslaughter with gross negligence, one felony count of hit-and-run with injury and a sentencing enhancement for fleeing the scene of the crime.
If convicted, Rivera faces a maximum sentence of 13 years in state prison. He is being held on $100,000 bail and is scheduled for a preliminary hearing, Thursday, July 22.