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

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

Change-Id: Ib38340f234e73e513010a9f438fd3aad5f8c2621