[Bug 225301] Merge Review: automake17