Merge "Pull ChooserTargetInfo API up to base TargetInfo." into tm-qpr-dev