merge android-4.4.2_r1.2-tag