Merge tag 'android-4.4_r1.2' into kitkat
Android 4.4 Release 1.2

Change-Id: I5543d47a9354d33db3d5c2e614da2d2e5b223e1d