Merge "Remove the old version of setAffiliationIds" into oc-dev
am: 8d902a9e28

Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6