Merge "Unify APIs descending from ChooserTargetInfo." into tm-qpr-dev