Merge "CTS Holo: Enlarge the threshold from 1 to 2"