Kingdom: Change BT/Wifi Props

Change-Id: I82633d3dffcca8c121383fa6bb01f7743b823aa4