Merge "Added error handling to settings suggestions list" into nyc-dev am: ed004e2958 am: 3253853473
am: d7525aeb78
Change-Id: Icef0c6d631dbe4b9b39ec1770b68968f31427e26
This commit is contained in: