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

Change-Id: I59070e618c3b9deb4be04cf7965b8773770ed8ca