Merge branch 'omni/android-4.4'