Merge "Compare only 20 characters when find label on watch" into pie-cts-dev am: 7faab9e16f am: 32c276aafc am: 795f9876a1
am: 7f486967ed

Change-Id: Ia630de2f446b55b471fd25e9542db9f5162a266c