Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback"...
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353 am: 70215248
Change-Id: I6aef0c2ce768ab6867f961b2494ba4ad4d4b8f8c