workarounds for smoke tempest smoke test

Change-Id: I94e68c7dd2a694c9e8e3d765347ef25c0c693619