Enable ION support

Change-Id: I72b32b8f39463288c299860c4e08c53e5d30df9c