Integration test fix.

Change-Id: I9214d47802fcd2689e7f26e656de02a6103a394f