WiFi-Direct-Fix

Change-Id: Ie9f89ba36126cd9da9a7675d6757b6ebb3a74735
VoIP Fix

Change-Id: I45233ad0fc89974a7d214b2afee543d548a1007e
Proximity-Fix

Change-Id: I736f2cf72c413b996fb572f0cea74021a5011480
Merge branch 'VoIP-Fix' into cm-12.0
Merge branch 'Proximity-Fix' into cm-12.0