Merge "[NAN-AWARE] Rename NAN to Aware"