Merge tag 'v4.4.38' into android-4.4.y