merge from Mkey-Android