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

Change-Id: I5e0f9a3f556ae0a078577e68694054ead19d268a