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