Clean up part 2

check for radio before drawing carrier label

Change-Id: I461332b8daefd3d343058f2aa60ceebe662ab86c