am 7a450b4d: am 643e5722: Merge "Report errors to the log, not just stderr."

* commit '7a450b4d9efc5457a987f5b5665ca7c6e7f57e34':
  Report errors to the log, not just stderr.