merge into android-4.4