Add support for touch and unlock.

Change-Id: Ie5f383f61ad00d656b5dd637a08aba3ef150c5d4