Merge remote-tracking branch 'origin/kitkat' into kitkat
revert accidentally deleted file
Merge remote-tracking branch 'origin/kitkat' into kitkat