Revert "ion: Squashed commit of upstream updates"

This reverts commit f407f5a37b9f208f340036edd959f719a083c50c.

Change-Id: I42004c1e6ac32014efac2fb53bcc14236a6a7013