Hot fix for CI temporary

Related-Bug: #1381586

Change-Id: I030834c0477d5cfeede8857182210cfbd30b0095