Merge android-4.4_r1.2 into ose-4.4