SG/CDC lab changes as per Excelleris' request

Change-Id: I0ec3603e916560fb264a5adc5766a8242f7c773d
Signed-off-by: Anita Kanyange <ak.kanyange@gmail.com>