Merge KitKat related changes from X68