tapioca: merge upstream changes from board:msm7627a

Change-Id: I1af5105e5f4babb416ed7e6c7e1e5fa3b55a53cf