Merge "Fix usage of assertThat in assertReviewers"