SG/CDC lab changes as per Excelleris' request

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