Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df am: 3c94a1c56c
am: 7fa6ab7f9a

Change-Id: I0d4e3abc35213a0c8eae5a764e73d59e1b336596