rebase for Kitkat-MR3

Signed-off-by: = <newhor1z00n@gmail.com>