Changes needed for repeated key presses

Change-Id: Iae0fd6546c2669b0dd19d8a66d927852228463b6