UserInputHandler cleanup.
am: bde20e1550

Change-Id: Ibabc430c411a6c68c6612b9e95b8c17b3771cd4b