Make Jenkins jobs workable

Change-Id: I0e90aca845b51a270d171dcbc9716891c77efae9