Revert "Revert "includes from 2.5.5""

This reverts commit 932f6f841e05136307e57877912babd52b683355.
on.h --> msm_ion.h