Merge android 4.4