[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 skip reason: Change-Id I8ebb334328c155098658ff2190181cd1cd811d55 with SHA-1 473c4deb is in history
Change-Id: I126bb5c01eb80b807278afd5b9b4668f60c1ab9f