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

Change-Id: I3d0ff25a0d7662e764c70a36b3c9167007fe9455