Merge "Merge "Plumb client target property." into rvc-dev am: ac17aa0a0f am: 5165524614" into rvc-d1-dev-plus-aosp