cleaned up data generation in 5g, reverted 5l handling of D_ADDR. R=rsc APPROVED=rsc DELTA=46 (0 added, 5 deleted, 41 changed) OCL=31241 CL=31243