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

Change-Id: I60e9bed296ff2fc1890be027e4da5e325a5b890a