Move ion allocations to use the same client. am: 8f7984018b
am: 14dc347738

Change-Id: I28ada0034100ed0e6dfbc2a0f9ee6ea81d690ff0