Merge "Tweak the expected result computation for TextViewCompat." into mnc-ub-dev