Merge "Replace data source with data reader" into rvc-dev am: edaedb06ee

Change-Id: I4cdfe11ffb40fa6601542fc843bc205461d56929