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

Change-Id: Ie99c9e7d6747866efb03484dbbeec89d4dc6d74b