Merge "[NAN] Reorder parameters of send message method(s) per API review"