Touchwake updates

Change-Id: Ib8b7b6ea03cf1ad26b8eaab14a8e2fd020b4e0da