Fix for broken unit tests for UserInputHandler.
am: 8b883320c1

Change-Id: I2d235c6c19296fbd5b96e6d62cf5064852994762