Merge branch 'android-4.4' into android-4.4