Track 4.4.1_r1 from AOSP

Change-Id: Ib1e4aedd8754d9368d576be3484677f6edd3f783