Merge "Merge "[AWARE] Minor fix to documentation for Aware + Discovery" into pi-dev am: 7cadb341cf" into pi-dev-plus-aosp