Cherry-pick one commit to add support for msm7x27a