More keypad/keychar updates

Change-Id: I8a3360ac2bbf72d7d73e957e3224e64cde3cc838