[NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
am: e4c50de752  -s ours

* commit 'e4c50de75273efaec4e9e8db6174e0bfc07d3105':
  [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]