Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef93 am: c8f03c33 am: 3c94a1c5 am: 7fa6ab7f Change-Id: I0d4e3abc35213a0c8eae5a764e73d59e1b336596