Update error diagnostics.

Change-Id: I8415450504f95cc3ad35866ed884fafc7ee24c90
8 files changed