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

Change-Id: I2520b4d4f59b6e94c655c7769b6a02382eeae7ad