[automerger skipped] resolv_integration_test: refactor TestCase to TestSuite...
[automerger skipped] resolv_integration_test: refactor TestCase to TestSuite am: 19a291bb am: f4aec131 am: a6d3276f am: b8b945fd -s ours
am skip reason: Change-Id I8ebb334328c155098658ff2190181cd1cd811d55 with SHA-1 473c4deb is in history
Change-Id: I00b0182b90d843dadf5b766ba9f5e730b7108989