Merge "Re-enable checker tests 536 and 537"