Fix DataSources to be thread-safe am: 03368b6cc0
am: ea3124f693

Change-Id: I17b5027aa566f88a3696dc3393c31326a416286c