Sylvia Rivera, Marsha P. Johnson