Merge "msm8x26: Moving to enforce mode"