Merge "Remove setQuirks() from IOMXNode and IOmxNode." into oc-dev