Merge "enable wifi p2p system feature"