Merge "Merge "[AWARE] Minor fix to documentation for Aware + Discovery" into...
Merge "Merge "[AWARE] Minor fix to documentation for Aware + Discovery" into pi-dev am: 7cadb341" into pi-dev-plus-aosp
am: cf027ad9
Change-Id: I1cb5394b1cda7bd945abc2856a5a495c30e5da86