Merge "Remove "instanceof" checks in TargetInfo clients." into tm-qpr-dev