Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am: 621dcdf9cd am: 1941584197
am: b1f13301a3

Change-Id: I381736613a5f7d207df327abddcd7f90fb2660c4