Merge "Improve Checker error messages" am: 785eeae66e
am: 512bfea684

* commit '512bfea68450b86255ffd1d3347271a434504960':
  Improve Checker error messages