Remove Affinity from Helium

Change-Id: I3161d3bff8149450002a0f12200bddfb9b6c75df
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Merge "Remove Affinity from Helium"