Merge "Switch touch input device on hover events." into oc-dev
am: 5a3361d2ed

Change-Id: Ic51df53ed3be731d52e18ee0e95e9f7e87509cf7