[automerger skipped] Merge "Merge the changes about the tests repeated...
[automerger skipped] Merge "Merge the changes about the tests repeated setResolverConfiguration" into rvc-dev am: a40187cf -s ours
am skip reason: Change-Id I86294a9d3a6050ccf8057b34eaa3463e00742850 with SHA-1 e2162e54 is in history
Change-Id: I5226aa1c093abb37ea3fdf61ea596989e89c3979