t0lte: consolidation

Change-Id: If8ee977f4d7b00d4b347157e4115ebca0c88a92c