Update to 4.4.4_r1

Sorry for the pull request, I can't use Gerrit right now.