Merge tag 'android-4.4.1_r1' into cr-4.4

Change-Id: I6dd5d8d6d0ecbcbb28185f1c0ff63a86f5ad4db2