Merge "Implement set addressed player."
am: 7798d9ddfc

Change-Id: I580191f4ddb9743103f5b25d519f7ab43f3b655e