Merge "ubi: merge changes from msm-3.18 kernel to msm-4.9 kernel"