Merge tag 'android-4.4_r1.2' into cr-4.4

Android 4.4 Release 1.2

Change-Id: I49aa832f55bbf870f09ab68e1d989aa03d19a0e1