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

Change-Id: I3bec0e3b27bea4516a73b428788c68858354eaf7