Merge "Replace data source with data reader" into rvc-dev am: edaedb06 am: bd60b7b7 am: b4636705 Change-Id: I0e55935fe1901732aa8d8db06e209cab72695a1a