Merge in kitkat mr1