Merge android-4.4_r1 kitkat