Merge from AOSP 4.4.4_r1