am feaeb5d7: am d599b393: Merge "Checker cleanup"

* commit 'feaeb5d71f35ecf807da01cc12eadb70e559cf59':
  Checker cleanup