Merge "PDK fix.  Remove conditional that stops component from being in PDK."
am: 4578bf1f96

Change-Id: Ib8c2c24a94ad96d182d547274fd9eaaf2f89fd7b