Merge "dx: Fix doc build warnings"