Provide multiple diagnostics when we can.

Change-Id: I2e13baa20cb7dd39ae2e00cd011771b1b8574357
4 files changed