Merge "Do not adding ResolveInfo if no ephemeral installer"