Merge "Improve Checker error messages"
am: 785eeae66e

* commit '785eeae66ebeb68d05878add2777df855846a1e2':
  Improve Checker error messages