enabling consistently passing test_integration

Change-Id: Icd589ef37b0724aa7847ee5e5fbc1d0dd704f150
Merge "enabling consistently passing test_integration"