Merge "Ellipsize Preference summaries" into nyc-dev
am: 0ca3829d4c

* commit '0ca3829d4c36c96099cd1d008036c252daf90b8e':
  Ellipsize Preference summaries

Change-Id: I2a787ec44b833cf03a9069b99bc79da957c562b2