Merge "[AWARE]: Add support for configuring NAN sid on subscriber side"