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

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