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

Change-Id: Ia9fe52b4c7ed38855ff8a2fbe236ae6494cf06c3