Merge "PDK fix.  Remove conditional that stops component from being in PDK."