Merge "Fix build broken by dfce17570e74e94404395a802."