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

Change-Id: I246d1fcabaa040171e76ef57ce1a04b088c93a51