More ION ifdeffing

Change-Id: Id34089dc2db0bde49da6725b53c63d6d1ad32780