ion: sync with d2

Change-Id: I210e25f5099b2563e49ef59a58f3b27f283ad82c