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