This reverts commit d8c48101.
Reason for revert: There is a better way to fix this problem by updating the KEY_HEIGHT to correct value rather than changing the way data is copied.
Change-Id: Id5919fa62b3557f6218b51d117bcb472e0490d6e
(cherry picked from commit e63e1471)