Merge android-4.4_r1.2 KRT16S