Merge "ion : Merge ion changes for msm-kona kernel upgrade"