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

Android 4.4 Release 1.2

Change-Id: Ibbd7cdb4dd47c18e67046d39218359c86b4f8814