Merge "Plumb getClientTargetProperty API."