Post-split, get jenkins tests passing

Change-Id: Ic6e545008504be633bf399712cd5bbbdf8184ad8