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

Change-Id: I95a4b13ed76b6ce38c50047c9c6c923bf2ef7778