Reconciliationation

Change-Id: I0cc4069417a3339da280a2aa5e40ed84ce693ad1
Add ion compat flag

Change-Id: Ifaf29c2b1fc358bc50f29979a62d66452a870fcf