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

Change-Id: I59901d50215f7362f5769b4c9ae8225921e6d643