ion: bulk update from mako

Change-Id: I57035a880c7209387bcf2fe270545bfbc6f4abf2