updated
Merge branch 'kk_2.7_rb1.10' into android-4.4