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

Change-Id: Icdb19bcdbf888341e59afe3992d5a04030ed0ac7