Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
am: 5f9afa968d

Change-Id: I7ca258416372dd251759aa920f51c2486d432f9c