jlo: merge upstream changes from board:msm7627a

hand work in browser editor xD