Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131 am: 10132fb994
am: 60aad2a2ba

Change-Id: I0b58a49cb980fb799b1e69ccc8e672ed8745fb2c