Merge "Re-enable checker tests 536 and 537" am: 713c519
am: f098d40

* commit 'f098d403e4c37042b3c00b88a56356a2565c3515':
  Re-enable checker tests 536 and 537