Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e29 am: 32538534 am: d7525aeb Change-Id: Icef0c6d631dbe4b9b39ec1770b68968f31427e26