Updated for P6800 trial

Change-Id: I4d84818c0ab5d508642429abbc98b36b80019957