Rebase to Official HTC Source (65bd5ca)