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

Change-Id: I34949cf675241a73d15b64718c7356c0bf3a2d7d