More CI changes

Change-Id: I23cc69f9b972245a2522ce7b44b3d908e8c461e6