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

Change-Id: Ibafa5185aca6ebae16e6aadaf0d0ab5ba7245c68