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

* commit '0ca3829d4c36c96099cd1d008036c252daf90b8e':
  Ellipsize Preference summaries

Change-Id: I2e133df847bcfe1726edbaab6e08369374cff3c9