Merge "[Resolver-log]: ResolverTest fail when enabling VERBOSE log severity."