Merge remote-tracking branch 'omni/android-4.4' into ose