Merge "Fix broken ApiDocGeneratorTest"