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

Change-Id: I75b3722f37d606e42effc9dee731210df958c7bd