Fast fix for smoke test

Change-Id: I1dcacff0dca466a5c78177fd8ff90181d9b111e2