Merge "Make sure non-fatal errors aren\'t printed."
am: dea5933

* commit 'dea59334a2bf9f7709fdb1874c5db6e9537bc291':
  Make sure non-fatal errors aren't printed.

Change-Id: I2e8e6e5db320825e2d4cc4cbb931277181f0ed33