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

Change-Id: I225951a67f0b399cfa7b8ddc744d5e155cb02860