Merge "Added error handling to settings suggestions list" into nyc-dev
am: ed004e2958

Change-Id: I674216ef4471444c86b202896b8ce055c54eb584