Merge "Minor cleanup in ApiBlockTest"