Merge "Use updated wifip2pmanager API"