Merge "[AWARE] Add discovery window period configuration" am: 17532ec02e am: f8637d5c04
am: 2fd54ee28a

Change-Id: Iba971429f57c90e0397e06f4d679ef2e3e660f41