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

Change-Id: I31f34ec26776ae7168128c47cda0fc29d08c7753