Merge "Added error handling to settings suggestions list am: 2197e8d6 am: a6e6feff" into nyc-mr1-dev-plus-aosp