Merge "[AWARE] Support multiple NAN data interfaces (NDI)" into oc-mr1-dev
am: c9c4c9fa24

Change-Id: I8dc0e337b858f5d05d696d13dc3bc10a7ea93b45
tree: 244fce71c3b4b11b0e1e389788e1ebba635f6da9
  1. service/
  2. PREUPLOAD.cfg