Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev am: 424dd39e25
am: d272847267

Change-Id: I255abd2bc0996a1d4daf9486da5ee11b5ea079c0