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

Change-Id: I5efb614d6ad8f1b7769485e839720a33cc2560a2