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

Change-Id: Ic43f3be2129e6e6da66850486123a39e48bee571