Merge "ipq806x: make diagnostics feature configurable."