Merge remote-tracking branch 'common/android-4.4' into android-4.4.y