Merge "Copy ResolverActivityTest to unbundled." into tm-qpr-dev