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

Change-Id: I3e8726f736066943164bb937f1f3aba6b415e1aa