Merge "[AWARE] Correct comment on Discovery Window usage"
am: 751dc694a4

Change-Id: I96a0b00713d01cb4a587a8ba44833c2a5f1a2cf0