'Merge into android 4.4_r1.