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

Change-Id: I9c6cac5bb7b69b0653e1076482761b45c28e20a8