Merge "Directly focus button in touchmode coretests" into oc-dev
am: 6797a20a86

Change-Id: I5aa0b42e08ba9e8c93c9795bc787907336aa6b19