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

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

Change-Id: If8da20586d37002dd712531ce8bdfd0242fb6eb8