Merge "Fix Hover tests for small watches." into oc-dev
am: 3bbe08f007

Change-Id: If555b5dd0a2a880368909bab091f18c031c4f0f8