Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
am: 3aa7f61eba

Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925