Merge "Test for expected comment in cherry pick acceptance tests"