Enable ion compatibility

Change-Id: Iaf83c4f20600cbc07572dd6cbfe83d79268db1e4