Merge "Plumb client target property." into rvc-dev am: ac17aa0a0f

Change-Id: I914b98b64731ea1dd0c0d53819790c95756f27a4