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

Change-Id: Ie971d01fc5b4201aad51f2943fcd4a165b2eb26a