Merge "Fixes ContactDiscoveryDialogFragmentTest" into rvc-dev am: 4105c9c576
am: 0c08f5d44e
am: 9796155099
am: ed39063010
am: df15f18379
Change-Id: Iaefe6b5c6a175ee74e517592aebe7eac7d522885
This commit is contained in: