Merge "Hyphenate text in CheckedTextView" into oc-dev
am: 801fc5de50

Change-Id: Ibf7c0e97e7c50fabbd40ab082e796777c4c4a7be