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